calendar-server: Temporarily ignore all deprecations in eds includes

Evolution draws in libsoup, which exposes deprecated types in its
API. While its headers have been fixed to guard the affected symbols,
those fixes aren't in our CI images yet.

Until we get a fixed version, just disable all deprecation warnings
during the include in order to not trip over "foreign" bugs.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/709

diff --git a/src/calendar-server/calendar-sources.c b/src/calendar-server/calendar-sources.c
index aa3fa64f910b8d852463807ccbce6776294b8e8e..ed76c015c34534b06358211c525d0fb3f2a7fb2f 100644 (file)
--- a/src/calendar-server/calendar-sources.c
+++ b/src/calendar-server/calendar-sources.c
@@ -29,7 +29,9 @@
 #include <string.h>
 #define HANDLE_LIBICAL_MEMORY
 #define EDS_DISABLE_DEPRECATED
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <libecal/libecal.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #undef CALENDAR_ENABLE_DEBUG
 #include "calendar-debug.h"

diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c
index 4eaaab4ac56d3f4acbe742dde2b0fd5b14b0e293..0e074fbbc2a33134c55b8662c08a8072cd13f5e3 100644 (file)
--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -35,7 +35,9 @@
 
 #define HANDLE_LIBICAL_MEMORY
 #define EDS_DISABLE_DEPRECATED
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <libecal/libecal.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include "calendar-sources.h"